From: Mazi Lo <openwrt.mazilo@xoxy.net>
Date: Sun, 14 May 2017 17:40:48 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/openwrt/telephony
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=b2ad28f1148d6dc96fdaad1f71436732dddb58a0;p=feed%2Ftelephony.git

Merge branch 'master' of https://github.com/openwrt/telephony
---

b2ad28f1148d6dc96fdaad1f71436732dddb58a0